Auto merge of #1429 - IvanUkhov:build-script, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 17 Mar 2015 16:32:06 +0000 (16:32 +0000)
committerbors <bors@rust-lang.org>
Tue, 17 Mar 2015 16:32:06 +0000 (16:32 +0000)

Trivial merge